tests/shell: Import introspected libraries as modules

Since commit 5e93791708 tests scripts are loaded as modules,
so we can (and should) use "proper" imports.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2835>

diff --git a/tests/shell/basic.js b/tests/shell/basic.js
index ef75ca4239d6a2834a11bbdcf3fd01ebd63998b9..588123fd887561043a27994b5141afc349b2d9de 100644 (file)
--- a/tests/shell/basic.js
+++ b/tests/shell/basic.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const St = imports.gi.St;
+import St from 'gi://St';
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

diff --git a/tests/shell/closeWithActiveWindows.js b/tests/shell/closeWithActiveWindows.js
index 2d696792c804853266f802021a3cf64dcbb44543..a2bec795429ae6a9d979b5fc2e05e8a59217a95f 100644 (file)
--- a/tests/shell/closeWithActiveWindows.js
+++ b/tests/shell/closeWithActiveWindows.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */
 
-const Clutter = imports.gi.Clutter;
+import Clutter from 'gi://Clutter';
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

diff --git a/tests/shell/headlessStart.js b/tests/shell/headlessStart.js
index 6f4157b2b5f3ee367d48bd0f0a9847bbe658126b..120d259d07d9e2eb1d22a7dd08723837ae1b4e29 100644 (file)
--- a/tests/shell/headlessStart.js
+++ b/tests/shell/headlessStart.js
@@ -1,9 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const GLib = imports.gi.GLib;
-const MetaTest = imports.gi.MetaTest;
-const Shell = imports.gi.Shell;
+import GLib from 'gi://GLib';
+import MetaTest from 'gi://MetaTest';
+import Shell from 'gi://Shell';
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

diff --git a/tests/shell/hwtest.js b/tests/shell/hwtest.js
index 6e4cd7ea28ebb6a444ce996cfc4aafbf94f030c8..5d9bfdb54d026ffa068db5edf2a904d9e3b57221 100644 (file)
--- a/tests/shell/hwtest.js
+++ b/tests/shell/hwtest.js
@@ -1,7 +1,7 @@
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^clutter"] }] */
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
+import Clutter from 'gi://Clutter';
+import Gio from 'gi://Gio';
+import Shell from 'gi://Shell';
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;